bitkeeper revision 1.1159.212.22 (41ee20131dSkJwS4ElWa61syAlMc-g)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 19 Jan 2005 08:53:39 +0000 (08:53 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 19 Jan 2005 08:53:39 +0000 (08:53 +0000)
commitf4eadd8b65f0d9ad2a0e20b8fd8be2dc39f46ced
tree6ac155e71dc7301ce3c84a5801a4539956394aff
parent11cf6ff859d7306ec298c27b0e598863b709b8e4
parentbec85fb4f6bf9ed5443f08db4d068aa9f24e8b0a
bitkeeper revision 1.1159.212.22 (41ee20131dSkJwS4ElWa61syAlMc-g)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
xen/common/dom0_ops.c
xen/common/page_alloc.c